[Feature] Implement True Force Switch (Roar, Whirlwind, Circle Throw, Dragon Tail) #4881
+42
−15
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DayKev
reviewed
Nov 16, 2024
DayKev
reviewed
Nov 16, 2024
| @@ -5979,7 +5979,21 @@ export class ForceSwitchOutAttr extends MoveEffectAttr { | |||
| return false; | |||
| } | |||
|
|
|||
| if (switchOutTarget.hp > 0) { | |||
| if (switchOutTarget.hp && SwitchType.FORCE_SWITCH) { | |||
There was a problem hiding this comment.
Here, the this.switchType === is missing.
| if (switchOutTarget.hp && SwitchType.FORCE_SWITCH) { | ||
| switchOutTarget.leaveField(this.switchType === SwitchType.FORCE_SWITCH); | ||
| const slotIndex = Utils.randIntRange(user.scene.currentBattle.getBattlerCount(), user.scene.getPlayerParty().length); | ||
| user.scene.unshiftPhase( |
There was a problem hiding this comment.
The existing code uses prependToPhase(..., MoveEndPhase) so I swapped the new code to use that as well.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What are the changes the user will see?
Force switching moves, such as Roar, will now randomly switch to a party member if applicable.
Why am I making these changes?
Fixes #4296
Turns the partial moves into fully implemented.
What are the changes from a developer perspective?
Very little, I implemented "Force_Switch" on the SwitchType Enum, everything should be done in move.ts and affects very little.
Screenshots/Videos
Battle to show that Trainers are random; the previous version would not allow combusken to be sent out if selected, due to the type advantage, as far as I know.
2024-11-15.21-25-53.mp4
Battle to show that Roar works on the player.
2024-11-15.21-38-51.mp4
How to test the changes?
Make the trainer have all roar while you have any non damaging move. Vice verse to test the other side.
Checklist
betaas my base branchnpm run test)